From f9ecef4e7ebc4897e692851832801a20fb7a90ac Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jul 2007 19:40:33 -0700 Subject: [PATCH] Fix problems with the --no-bitmap-icon argument. --- debian/changelog | 5 ++- debian/patches/fix-bitmap-icon-arg.diff | 42 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-bitmap-icon-arg.diff diff --git a/debian/changelog b/debian/changelog index 1bb09538f4a..1c427676e09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,10 @@ emacs22 (22.1+1-2) unstable; urgency=low * Fix control file for binary NMUs. Thanks to Lior Kaplan . (closes: #432957) [rlb] - -- Rob Browning Sun, 29 Jul 2007 19:21:20 -0700 + * Fix problem with --no-bitmap-icon with upstream patch. Thanks to Sven + Joachim . (closes: #433969) [rlb] + + -- Rob Browning Sun, 29 Jul 2007 19:34:46 -0700 emacs22 (22.1+1-1) unstable; urgency=low diff --git a/debian/patches/fix-bitmap-icon-arg.diff b/debian/patches/fix-bitmap-icon-arg.diff new file mode 100644 index 00000000000..d270ea293b6 --- /dev/null +++ b/debian/patches/fix-bitmap-icon-arg.diff @@ -0,0 +1,42 @@ +* A problem with the --no-bitmap-icon argument has been fixed. + Patch: fix-bitmap-icon-arg.diff + Provided-by: Sven Joachim + Date: Sun, 22 Jul 2007 17:16:09 +0200 + Added-by: Rob Browning + Status: appears to be incorporated upstream + + Upstream changelog entry: + + 2007-07-22 Jan Djärv + + * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon. + + * term/x-win.el (x-handle-no-bitmap-icon): New function. + +Index: sid/lisp/startup.el +=================================================================== +--- sid.orig/lisp/startup.el ++++ sid/lisp/startup.el +@@ -144,7 +144,7 @@ + ("--foreground-color" 1 x-handle-switch foreground-color) + ("--background-color" 1 x-handle-switch background-color) + ("--mouse-color" 1 x-handle-switch mouse-color) +- ("--no-bitmap-icon" 0 x-handle-switch icon-type nil) ++ ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon) + ("--iconic" 0 x-handle-iconic) + ("--xrm" 1 x-handle-xrm-switch) + ("--cursor-color" 1 x-handle-switch cursor-color) +Index: sid/lisp/term/x-win.el +=================================================================== +--- sid.orig/lisp/term/x-win.el ++++ sid/lisp/term/x-win.el +@@ -129,6 +129,9 @@ + initial-frame-alist) + x-invocation-args (cdr x-invocation-args))))))) + ++(defun x-handle-no-bitmap-icon (switch) ++ (setq default-frame-alist (cons '(icon-type) default-frame-alist))) ++ + ;; Make -iconic apply only to the initial frame! + (defun x-handle-iconic (switch) + (setq initial-frame-alist diff --git a/debian/patches/series b/debian/patches/series index 62b336872df..b7ffe992b2d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +fix-bitmap-icon-arg.diff debian-site-init-el.diff debian-startup.diff debian-adjust-mail-from-addresses.diff -- 2.30.2